From df12a41cbb440f2543086d865710240df8761cb5 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 3 Nov 2021 20:39:33 -0400
Subject: [PATCH] testsuite: Set GDK_DEBUG unconditionally

The default-settings key works in non-debug builds
too, nowadays.
---
 testsuite/meson.build | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/testsuite/meson.build b/testsuite/meson.build
index 10fa16dfbc..97344f3062 100644
--- a/testsuite/meson.build
+++ b/testsuite/meson.build
@@ -8,12 +8,9 @@ common_env = [
   'GTK_CSD=1',
   'G_ENABLE_DIAGNOSTIC=0',
   'GSETTINGS_SCHEMA_DIR=@0@'.format(gtk_schema_build_dir),
+  'GDK_DEBUG=default-settings',
 ]
 
-if get_option('debug')
-  common_env += [ 'GDK_DEBUG=default-settings' ]
-endif
-
 if x11_enabled
   add_test_setup ('x11',
                   env: common_env + [
@@ -30,16 +27,11 @@ if wayland_enabled
                         'TEST_OUTPUT_SUBDIR=wayland',
                         ])
 
-  if get_option('debug')
-    gdk_debug = 'GDK_DEBUG=gl-gles,default-settings'
-  else
-    gdk_debug = 'GDK_DEBUG=gl-gles'
-  endif
   add_test_setup ('waylandgles',
                   env: common_env + [
                         'GDK_BACKEND=wayland',
                         'TEST_OUTPUT_SUBDIR=waylandgles',
-                        gdk_debug,
+                        'GDK_DEBUG=gl-gles,default-settings',
                         ])
 
 endif
-- 
2.30.2